more refactor of placement of component/system code