Allow using a different DB path
Reorganize directory structure