Rearrange and rename most functions in the onslaught file, for easier browsing and cleaning