Reorganize setup for addition of Ontology
Reorganize files