Fixed #133 - refactored GSON class files to correct location