Directory structure needs to be cleaner