refactor files, rename concepts