Refactor package names to correspond to module names