Restructure package. Fix superior.
Stage from the appropriate directory.