Split tools into separate package.
Fixed id types.
Cleaned up XSD after instantiating.