complete basic OBR resolver, refactoring, remove unneeded files