Redid file naming convention, added stuff for Strings