FIX Components dir