moving stuff around to modules