Refactored source packages