Fixing directory structure