Added plenty of other packages, reorganized some files