renamed files, visual cleanup