Added data parsing class, renamed data file, re-formatted code