clean up project and use bundle gem structure