Revert "Avoid hardcoded directory name"

This reverts commit b8904c10bfb3a7e6f5b8ccaca5ceb453ceb03016.
Revert "Unecessary work to fix this everywhere"

This reverts commit e5773648f72412fa1f29a89ee7a68f1ca87c4df9.
Revert "Rename package to reflect plus everywhere"

This reverts commit e18912ce1d8342180f1b98e2b94cc0c0b8d0258b.