Changed package, added new data parser, generated data provider