(Attempt 2) Reorganizing and implementing ontological support