Refactoring of projec/client creation.