More refactoring into new assemblies