FIX: Flatten project structure