[dev] refactoring packages