Added companion objects to factories
Broken check in: Guice has a circular dependency caused by FactoryIdToFactoryImpl being on LegalNeighboursImpl which is in turn on every factory
Fix previous broken commit, starting work of using Int instead of factory in the memo