refactored project packages