create branch dev with a cleaner structure

The workflow with the previous wokr-tree structure wasn't good. Trying to
improve productivity with new structure