Towards weekly build, package refactoring
2 files changed