Modified the working dir to logic layer
Merge branch 'feature/delete' into develop