Cleanup time

* Organize templates into subfolders, choose a naming convention
* Line lengths
* Fix whitespace
* Remove some wildcard imports