Bump version numbers and change dependency order