Changes to project directory structure to accommodate Maven