Complete the project reorganization