Project and Feature bundles moved out of Bundle folder
Stray template removed
First pass at formatting