Merge pull request #1 from sotty/master

Initial Structure
Ontology fixes