Reformated the structure of the files