Fixes directory structure