Get rid of pade.common
Clean up schema a bit