Moved things around
Removed unused template thingy
Updated readme
Adjusted some template stuff