Directory restructure, simplification, no postgresql support anymore, may add later