Reorganize files, rename methods
Merge and tidy up