Why not just put his covers on the floor to start with, make it out like hes camping?
I wouldn't worry about him waking in the night if he's getting himself back to sleep, lots of toddlers do that, I reckon my son does it when he needs a wee which I'll be very grateful of when the night-time nappy comes off!

Well thank you for the ideas, I am sure I will give them a try. We have a routeen down where we give a 10 minute warning, then do teeth, then cloths, then read two books of his choice but he likes to roam around the room after that. It appears to be his way of winding down. They teach us something new every day.