Gioc: Refactoring build. Removing cruft. Adding solver collections.
Main: Remove cyclic dep trigger.