Fixing directory structure from initial import.