Refactoring GFileBuilder

WAY-35