Fix horribly broken directory structure