Removed srv-new
Merge remote-tracking branch 'origin/restructure' into restructure