Revert package separation for now