Refactored project packages
Refactored project packages