switched to freemarker and cleaned up files