Changed module name, deleted obselete files