[Code Improvments]
	- Changes templates to a common directory
	- Adds some code refactor