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

This reverts commit 212545bfe5f7a20b4af426bdfd39a3272036c5b3.