Code refactoring
remove redundant file
Refactore
Separate code into several files