restructure the project a bit
more cleanup