Moved app templates; Removed unused files