slight module organization change