reorganized file structure and changed visual mode highlighting