reorginization of project for inclusion of 3rd party libs