Moved files
Refactor, implemented templates