refactor and structure project
remove original file