refactor basic files.