diff --git a/new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt b/new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt
deleted file mode 100644
index 9e41e96443..0000000000
Binary files a/new/eeschema_part_sexpr_format_EN.odt.obsolete_use_fodt and /dev/null differ
diff --git a/new/sch_part.cpp b/new/sch_part.cpp
index 6774d5c7f2..e7a0641f5c 100644
--- a/new/sch_part.cpp
+++ b/new/sch_part.cpp
@@ -31,11 +31,12 @@
 #include <macros.h>
 
 
+
 /**
  * Function formatAt
  * outputs a formatted "(at X Y [ANGLE])" s-expression
  */
-static void formatAt( OUTPUTFORMATTER* out, const POINT& aPos, ANGLE aAngle, int indent=0 )
+ static void formatAt( OUTPUTFORMATTER* out, const SCH::POINT& aPos, ANGLE aAngle, int indent=0 )
     throw( IO_ERROR )
 {
     // if( aPos.x || aPos.y || aAngle )
diff --git a/new/sch_part.h b/new/sch_part.h
index 77e094823f..65de8d09c3 100644
--- a/new/sch_part.h
+++ b/new/sch_part.h
@@ -103,16 +103,6 @@ class PART;
 class SWEET_PARSER;
 class PROPERTY;
 
-};
-
-/// a set of pin padnames that are electrically equivalent for a PART.
-typedef std::set< wxString >            MERGE_SET;
-
-/// The key is the VISIBLE_PIN from
-/// (pin_merge VISIBLE_PIN (hide HIDDEN_PIN1 HIDDEN_PIN2...))
-typedef boost::ptr_map< wxString, MERGE_SET >  MERGE_SETS;
-
-
 class POINT : public wxPoint
 {
 public:
@@ -125,6 +115,15 @@ public:
     {}
 };
 
+};
+
+/// a set of pin padnames that are electrically equivalent for a PART.
+typedef std::set< wxString >            MERGE_SET;
+
+/// The key is the VISIBLE_PIN from
+/// (pin_merge VISIBLE_PIN (hide HIDDEN_PIN1 HIDDEN_PIN2...))
+typedef boost::ptr_map< wxString, MERGE_SET >  MERGE_SETS;
+
 
 /**
  * Class FONTZ
diff --git a/new/sch_sweet_parser.h b/new/sch_sweet_parser.h
index 9b55c2a89e..2e6fd3c9fb 100644
--- a/new/sch_sweet_parser.h
+++ b/new/sch_sweet_parser.h
@@ -29,13 +29,13 @@
 #include <sweet_lexer.h>
 
 
-class POINT;
 typedef int     STROKE;
 
 namespace SCH {
 
 class LIB_TABLE;
 class PART;
+class POINT;
 
 
 // GRAPHICS
diff --git a/new/sweet.keywords b/new/sweet.keywords
index 475402d711..88e23fe3a1 100644
--- a/new/sweet.keywords
+++ b/new/sweet.keywords
@@ -3,7 +3,6 @@ anchor
 arc
 at
 bezier
-inout
 bold
 bottom
 center
@@ -22,6 +21,7 @@ font
 footprint
 hide
 in
+inout
 input_low
 inverted
 inverted_clk
diff --git a/new/sweet.fodt b/new/sweet_spec_for_schematic_parts_EN.fodt
similarity index 100%
rename from new/sweet.fodt
rename to new/sweet_spec_for_schematic_parts_EN.fodt