moved DSL classes around