major project restructure. Out with the old!