Clean the package structure (refactroring only, no behavior change)