code cleanup, deleted and moved template files.