restructure for deploymenr