folder restructure, some rethinking on how this will work
More folder restructure