Moved file into template directory
Moved stuff around
Mass commit