Reorganized templates
Moved templates to different directory
Changed userprovider to support userid
Controller cleanup