edited data
minor style changes, rearrange files