Start fix the package mess