Enabled collection scaling again in factory.
Moved proto classes to their own package.