Fix confusing directory structure