Refactored types into correct assemblies