Cleaning up the template structure. Ready to begin some nice grafic-works