[wallace] Merging in master, and breaking projects up.