Continue deleting redundant files, moving functions into more sensible places.