refactor dsl structure
Merge pull request #23 from jilen/refactor

refactor dsl structure