Better file organization, akin to PoTS's
Merge branch 'master' of github.com:jbahamon/ctm-ayla