Adapted project structures in order to keep DSL and Code together