Project directory organization.
Further project directory reorganization.