Renaming some files, removing some cruft and making static templates work