Re-arrange file structure
Chapter 3 - Templates