Cleaning up folders

Clearing up folder structures