Converted most files to use new Template module
Fixed last few issues with creating a Templates module