moving stuff to module