Rafactor of Schema packages folder