Directory refactoring
Market -> LM
Persister and directory refac
little refac