Moved messages into separate assemblies
Changed assemblies to scan