move things into correct module