reorganize folders and package entries