Was able to move some of them up one level so they are valid on more
platforms with less duplication