added gml folder and cleaned up the code