Reorganization to NOT use project dependencies.