basic restructure and postgres readyness