adjust project
made a little refactoring