Clean up

Cleaning up folders and files