Reformati directory structure
Reformat directories