FIX: Fix dir structure