Complete refactor lang files, add SrvAgrmts, standardize formating