Reworked template directory. Note common, and demo was moved to challenges