Make file structural changes
Fix leaks of shared service objects