Moved scala into code/scala, dsl into code/dsl.