re-organize everything for deploying