restructured the layout of the files