add branch persistence to server, refactor spring config