updated project layout to move everything into lib/ to make it more composer like project