add mixins and dsl as modules
add dsl and mixin