Some refactoring in screener + app vs lib decoupling