Bootstrap project reorganization