Move support/lib into lib/Support