Revert "making packages broke the manifest REALLY bad. Could not revert. Had to change back by hand."

This reverts commit 409b011f0c744f2a1d056997981b2b35e7729ac7.
Revert "Organized packages"

This reverts commit 893435111d3255d0a5ceb7d64660bb317c34177d.