Made spring dependency optional. Renamed xsd's