Template cleanups
Renamed files
Cleanup
Adopted to new konstrukteur version