reworking the files and names, so the names make sense