project reorganization in anticiaption of using Make