Fixed templates.
Remove unused files.
Code refactor
Rename
UI improvements