rename file and code re-organize