Renamed and moved app template files.
Removed deprecated files.