Changed to the new project directory structure