Applied correct directory structure