Fix directory structure for imports