a little refactoring regarding the names of project and package