template changes, controllers rename
Merge pull request #3 from hxtpoe/rename

template changes, controllers rename