Tidy up methods

Grouped methods in files by the object they correspond to.