Some better restructuring and starting to get login bar
Fixing up past checkin and getting some more template setup