Salaam
Mashallah brother may Allah reward you for the steps you have taken toward Him.
The night prayer is performed by praying two Rakah's followed by two and so on...in an even-numbered manner. If you then believe that Fajr prayer has come near, pray one Rakah as the Witr for the previous Rakahs you prayed.
"Once a person asked Allah's Apostle about the night prayer. Allah's Apostle replied, "The night prayer is offered as two Rakat followed by two Rakat and so on and if anyone is afraid of the approaching dawn (Fajr prayer) he should pray one Raka and this will be a Witr for all the Rakat which he has prayed before." Nafi' told that 'Abdullah bin 'Umar used to say Taslim between (the first) two Rakat and (the third) odd one in the Witr prayer, when he wanted to attend to a certain matter (during that interval between the Rakat)." Sahih Bukhari (Volume 2, Book 16, Number 105)