Package reorganization succeeded!
I successfully refactored the package. It's clearer now!