switched to maven directory structure and maven project management