Changed KeywordRawData to a one-per-keyword object, moved into data folder