refactored project hierarchy.