Rename FOGService folder for merging