Moved the DSL parser code to the appropriate module