Re-arranged file structure
half way through templates stage