Refactor add new file and a reorganise