Modifying to be slightly more modular and no longer sym-link