refocus on core and basic modules
refocus, restructuring modules