Adding Scala modules (cycles are still present)