Refactor DSL Files