Nearly finished moving depen. to lib
Finished with lib, now adding terms app