move modules to modules, libs to libs