Restructure to make room for Scala solutions.