slight package restructure