split some modules and reduced some use * 's..