Correct directory and package structure