Refactoring... commenting...
Renamed template to work
Added composer, other things...