tests run successfully - requires file structure reorg for lower maintenance
reorganizing file structure & updating configs / templates