Pethan reorganized the folder structure and simplified a bunch of things.  Hoping we can start committing again with this structure in place 3