some reorganization of strings and which files they are located in