Finish DSL and refactor to builders folder