Finish Clean Up

Extra folders removed