Refactored project organization.