refactoring, change project name and some file names