Updates and fixes

Cleaned up folders and removed unused files. Cleaned up template.