changed files names and such