Change structure of folders and rename packages
Change structure of folders and rename packages