resorting files organisation by folder
Merge branch 'paulyves' into development