few changes
Change of the file structure and rename a few files