New template structure

Plus all changes of the past three weeks...
Add forgotten files
No idea what exactly were the changes here
Implement half of the application