Cleanup project structure - import fix