refactored package in common project