Change structure of folders and rename packages