More design changes.
Soem refactoring to make dev work easier and deployment to prod easier.