Move support/lib/Support back to lib/Support