Rearranging/structuring, bumped the version a bunch of times