restructure in order to deploy with extra libs