Cleaned up and moved templates