refactore new scope modules a little