Deleted redundant files.
Fixed packages that don't get differentiated.