folder structure

Cleaning up folder structure