Made many template changes and moved all included templates into the includes directory.