Remove remaining of_import & SRC_PATH. Improve public model. First working test.