Realigned folder structure to better support installation into our standard app structure.
prepping to merge in new folder strucure
Merge branch 'feature/consolidated-folder-structure' into t1m

* feature/consolidated-folder-structure:
  Realigned folder structure to better support installation into our standard app structure.