Reformatted Main classes
Removed underscores from data files