restructuring for deployment
restructuring for deployment