Revert "Package reorganization"

This reverts commit f6208a75f2fe62fc52425ba035a567d8bf3cbe1f.