moving folders
changes to module defs