move things into a module