Cleaned up directory structure

This PR cleans up a few things.