Fixes to Linfo after refactoring directories