Organized folders and stuff

Organized folders and stuff