Redo "The dependencies of the sub packages are causing problems."

This reverts commit 5b8743446ec73da443a9c8f532bab10ea0dcc67a.