Some source code packages refactor