Less local files, index touchups, restructured files