minor restructure updates