lots of tweaks, folder restructuring, starting to build with propel, bundling composer