Rearranged files and folders and added packages