Cleaning up

Directories got all messy due to naming conventions