Moving files to ontology folder. Fixing bugs.