Modified some paths to be more generic and not require rewrite. Some instances of phase names have been changed, others are still in process.
