changes to structure, moving to ui/modular