diff --git a/src/sparse.c b/src/sparse.c
index f220086..9eb7d57 100644
--- a/src/sparse.c
+++ b/src/sparse.c
@@ -74,7 +74,7 @@
 #define yychar          sphere_yychar
 
 /* First part of user prologue.  */
-#line 1 "sparse.y"
+#line 1 "src/sparse.y"
 
 #include <stdio.h>
 #include <string.h>
@@ -110,7 +110,7 @@ static double human2dec(double d, double m, double s)
 }
 
 
-#line 114 "sparse.c"
+#line 114 "src/sparse.c"
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
@@ -134,8 +134,8 @@ static double human2dec(double d, double m, double s)
 
 /* Use api.header.include to #include this header
    instead of duplicating it here.  */
-#ifndef YY_SPHERE_YY_SPARSE_H_INCLUDED
-# define YY_SPHERE_YY_SPARSE_H_INCLUDED
+#ifndef YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
+# define YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -187,13 +187,13 @@ extern int sphere_yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 41 "sparse.y"
+#line 41 "src/sparse.y"
 
 	int		i;
 	double	d;
 	char	c[3];
 
-#line 197 "sparse.c"
+#line 197 "src/sparse.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -206,7 +206,7 @@ extern YYSTYPE sphere_yylval;
 
 int sphere_yyparse (void);
 
-#endif /* !YY_SPHERE_YY_SPARSE_H_INCLUDED  */
+#endif /* !YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED  */
 
 
 
@@ -1349,265 +1349,265 @@ yyparse (void)
   switch (yyn)
     {
   case 4:
-#line 70 "sparse.y"
+#line 70 "src/sparse.y"
     { set_spheretype( STYPE_POINT   ); }
-#line 1355 "sparse.c"
+#line 1355 "src/sparse.c"
     break;
 
   case 5:
-#line 71 "sparse.y"
+#line 71 "src/sparse.y"
     { set_spheretype( STYPE_CIRCLE  ); }
-#line 1361 "sparse.c"
+#line 1361 "src/sparse.c"
     break;
 
   case 6:
-#line 72 "sparse.y"
+#line 72 "src/sparse.y"
     { set_spheretype( STYPE_LINE    ); }
-#line 1367 "sparse.c"
+#line 1367 "src/sparse.c"
     break;
 
   case 7:
-#line 73 "sparse.y"
+#line 73 "src/sparse.y"
     { set_spheretype( STYPE_EULER   ); }
-#line 1373 "sparse.c"
+#line 1373 "src/sparse.c"
     break;
 
   case 8:
-#line 74 "sparse.y"
+#line 74 "src/sparse.y"
     { set_spheretype( STYPE_PATH    ); }
-#line 1379 "sparse.c"
+#line 1379 "src/sparse.c"
     break;
 
   case 9:
-#line 75 "sparse.y"
+#line 75 "src/sparse.y"
     { set_spheretype( STYPE_ELLIPSE ); }
-#line 1385 "sparse.c"
+#line 1385 "src/sparse.c"
     break;
 
   case 10:
-#line 76 "sparse.y"
+#line 76 "src/sparse.y"
     { set_spheretype( STYPE_BOX     ); }
-#line 1391 "sparse.c"
+#line 1391 "src/sparse.c"
     break;
 
   case 11:
-#line 81 "sparse.y"
+#line 81 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].d); }
-#line 1397 "sparse.c"
+#line 1397 "src/sparse.c"
     break;
 
   case 12:
-#line 82 "sparse.y"
+#line 82 "src/sparse.y"
     { (yyval.d) = (yyvsp[0].i); }
-#line 1403 "sparse.c"
+#line 1403 "src/sparse.c"
     break;
 
   case 13:
-#line 87 "sparse.y"
+#line 87 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d) ); }
-#line 1409 "sparse.c"
+#line 1409 "src/sparse.c"
     break;
 
   case 14:
-#line 88 "sparse.y"
+#line 88 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0) ); }
-#line 1415 "sparse.c"
+#line 1415 "src/sparse.c"
     break;
 
   case 15:
-#line 89 "sparse.y"
+#line 89 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0) ); }
-#line 1421 "sparse.c"
+#line 1421 "src/sparse.c"
     break;
 
   case 16:
-#line 90 "sparse.y"
+#line 90 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0) ); }
-#line 1427 "sparse.c"
+#line 1427 "src/sparse.c"
     break;
 
   case 17:
-#line 91 "sparse.y"
+#line 91 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0) ); }
-#line 1433 "sparse.c"
+#line 1433 "src/sparse.c"
     break;
 
   case 18:
-#line 92 "sparse.y"
+#line 92 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0) ); }
-#line 1439 "sparse.c"
+#line 1439 "src/sparse.c"
     break;
 
   case 19:
-#line 93 "sparse.y"
+#line 93 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d)) ); }
-#line 1445 "sparse.c"
+#line 1445 "src/sparse.c"
     break;
 
   case 20:
-#line 94 "sparse.y"
+#line 94 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d)) ); }
-#line 1451 "sparse.c"
+#line 1451 "src/sparse.c"
     break;
 
   case 21:
-#line 99 "sparse.y"
+#line 99 "src/sparse.y"
     { (yyval.i) = set_angle(0, (yyvsp[0].d)); }
-#line 1457 "sparse.c"
+#line 1457 "src/sparse.c"
     break;
 
   case 22:
-#line 100 "sparse.y"
+#line 100 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].d), 0, 0)); }
-#line 1463 "sparse.c"
+#line 1463 "src/sparse.c"
     break;
 
   case 23:
-#line 101 "sparse.y"
+#line 101 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-1].i), 0, 0)); }
-#line 1469 "sparse.c"
+#line 1469 "src/sparse.c"
     break;
 
   case 24:
-#line 102 "sparse.y"
+#line 102 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1475 "sparse.c"
+#line 1475 "src/sparse.c"
     break;
 
   case 25:
-#line 103 "sparse.y"
+#line 103 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].d), 0)); }
-#line 1481 "sparse.c"
+#line 1481 "src/sparse.c"
     break;
 
   case 26:
-#line 104 "sparse.y"
+#line 104 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-3].i), (yyvsp[-1].i), 0)); }
-#line 1487 "sparse.c"
+#line 1487 "src/sparse.c"
     break;
 
   case 27:
-#line 105 "sparse.y"
+#line 105 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1493 "sparse.c"
+#line 1493 "src/sparse.c"
     break;
 
   case 28:
-#line 106 "sparse.y"
+#line 106 "src/sparse.y"
     { (yyval.i) = set_angle(1, human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1499 "sparse.c"
+#line 1499 "src/sparse.c"
     break;
 
   case 29:
-#line 107 "sparse.y"
+#line 107 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-2].i), (yyvsp[0].d), 0)); }
-#line 1505 "sparse.c"
+#line 1505 "src/sparse.c"
     break;
 
   case 30:
-#line 108 "sparse.y"
+#line 108 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].d))); }
-#line 1511 "sparse.c"
+#line 1511 "src/sparse.c"
     break;
 
   case 31:
-#line 109 "sparse.y"
+#line 109 "src/sparse.y"
     { (yyval.i) = set_angle(1, 15 * human2dec((yyvsp[-5].i), (yyvsp[-3].i), (yyvsp[-1].d))); }
-#line 1517 "sparse.c"
+#line 1517 "src/sparse.c"
     break;
 
   case 32:
-#line 114 "sparse.y"
+#line 114 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1523 "sparse.c"
+#line 1523 "src/sparse.c"
     break;
 
   case 33:
-#line 115 "sparse.y"
+#line 115 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1529 "sparse.c"
+#line 1529 "src/sparse.c"
     break;
 
   case 34:
-#line 120 "sparse.y"
+#line 120 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), 1); }
-#line 1535 "sparse.c"
+#line 1535 "src/sparse.c"
     break;
 
   case 35:
-#line 121 "sparse.y"
+#line 121 "src/sparse.y"
     { (yyval.i) = set_angle_sign((yyvsp[0].i), (yyvsp[-1].i)); }
-#line 1541 "sparse.c"
+#line 1541 "src/sparse.c"
     break;
 
   case 36:
-#line 128 "sparse.y"
+#line 128 "src/sparse.y"
     {
 			(yyval.i) = set_point((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1549 "sparse.c"
+#line 1549 "src/sparse.c"
     break;
 
   case 37:
-#line 136 "sparse.y"
+#line 136 "src/sparse.y"
     {
 			set_circle((yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1557 "sparse.c"
+#line 1557 "src/sparse.c"
     break;
 
   case 38:
-#line 144 "sparse.y"
+#line 144 "src/sparse.y"
     {
 			set_euler((yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].i), "ZXZ");
 		}
-#line 1565 "sparse.c"
+#line 1565 "src/sparse.c"
     break;
 
   case 39:
-#line 148 "sparse.y"
+#line 148 "src/sparse.y"
     {
 			set_euler((yyvsp[-6].i), (yyvsp[-4].i), (yyvsp[-2].i), (yyvsp[0].c));
 		}
-#line 1573 "sparse.c"
+#line 1573 "src/sparse.c"
     break;
 
   case 40:
-#line 156 "sparse.y"
+#line 156 "src/sparse.y"
     {
 			set_line ((yyvsp[0].i));
 		}
-#line 1581 "sparse.c"
+#line 1581 "src/sparse.c"
     break;
 
   case 43:
-#line 168 "sparse.y"
+#line 168 "src/sparse.y"
     { }
-#line 1587 "sparse.c"
+#line 1587 "src/sparse.c"
     break;
 
   case 44:
-#line 174 "sparse.y"
+#line 174 "src/sparse.y"
     {
 			set_ellipse((yyvsp[-8].i), (yyvsp[-6].i), (yyvsp[-3].i), (yyvsp[-1].i));
 		}
-#line 1595 "sparse.c"
+#line 1595 "src/sparse.c"
     break;
 
   case 45:
-#line 181 "sparse.y"
+#line 181 "src/sparse.y"
     { }
-#line 1601 "sparse.c"
+#line 1601 "src/sparse.c"
     break;
 
   case 46:
-#line 182 "sparse.y"
+#line 182 "src/sparse.y"
     { }
-#line 1607 "sparse.c"
+#line 1607 "src/sparse.c"
     break;
 
 
-#line 1611 "sparse.c"
+#line 1611 "src/sparse.c"
 
       default: break;
     }
diff --git a/src/sparse.h b/src/sparse.h
index 032b5fd..e6a1000 100644
--- a/src/sparse.h
+++ b/src/sparse.h
@@ -34,8 +34,8 @@
 /* Undocumented macros, especially those whose name start with YY_,
    are private implementation details.  Do not rely on them.  */
 
-#ifndef YY_SPHERE_YY_SPARSE_H_INCLUDED
-# define YY_SPHERE_YY_SPARSE_H_INCLUDED
+#ifndef YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
+# define YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -87,13 +87,13 @@ extern int sphere_yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 41 "sparse.y"
+#line 41 "src/sparse.y"
 
 	int		i;
 	double	d;
 	char	c[3];
 
-#line 97 "sparse.h"
+#line 97 "src/sparse.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -106,4 +106,4 @@ extern YYSTYPE sphere_yylval;
 
 int sphere_yyparse (void);
 
-#endif /* !YY_SPHERE_YY_SPARSE_H_INCLUDED  */
+#endif /* !YY_SPHERE_YY_SRC_SPARSE_H_INCLUDED  */
diff --git a/src/sscan.c b/src/sscan.c
index 3d904c6..0df711e 100644
--- a/src/sscan.c
+++ b/src/sscan.c
@@ -1,6 +1,6 @@
-#line 2 "sscan.c"
+#line 2 "src/sscan.c"
 
-#line 4 "sscan.c"
+#line 4 "src/sscan.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -722,8 +722,8 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "sscan.l"
-#line 2 "sscan.l"
+#line 1 "src/sscan.l"
+#line 2 "src/sscan.l"
 #include <stdio.h>
 #include "string.h"
 #include "sparse.h"
@@ -745,8 +745,8 @@ void sphere_flush_scanner_buffer(void)
 {
 	YY_FLUSH_BUFFER;
 }
-#line 749 "sscan.c"
-#line 750 "sscan.c"
+#line 749 "src/sscan.c"
+#line 750 "src/sscan.c"
 
 #define INITIAL 0
 
@@ -961,9 +961,9 @@ YY_DECL
 		}
 
 	{
-#line 35 "sscan.l"
+#line 35 "src/sscan.l"
 
-#line 967 "sscan.c"
+#line 967 "src/sscan.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1018,106 +1018,106 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 36 "sscan.l"
+#line 36 "src/sscan.l"
 sphere_yylval.i = (strcmp("-", yytext)) ? (1) : (-1); return SIGN;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 37 "sscan.l"
+#line 37 "src/sscan.l"
 sphere_yylval.i = atoi(yytext); return INT;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 38 "sscan.l"
+#line 38 "src/sscan.l"
 sphere_yylval.d = atof(yytext); return FLOAT;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 39 "sscan.l"
+#line 39 "src/sscan.l"
 memcpy(&sphere_yylval.c[0], yytext, 3); return EULERAXIS;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 40 "sscan.l"
+#line 40 "src/sscan.l"
 return HOUR;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 41 "sscan.l"
+#line 41 "src/sscan.l"
 return DEG;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 42 "sscan.l"
+#line 42 "src/sscan.l"
 return MIN;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 43 "sscan.l"
+#line 43 "src/sscan.l"
 return MIN;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 44 "sscan.l"
+#line 44 "src/sscan.l"
 return SEC;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 45 "sscan.l"
+#line 45 "src/sscan.l"
 return SEC;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 46 "sscan.l"
+#line 46 "src/sscan.l"
 return COMMA;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 47 "sscan.l"
+#line 47 "src/sscan.l"
 return OPENCIRC;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 48 "sscan.l"
+#line 48 "src/sscan.l"
 return CLOSECIRC;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 49 "sscan.l"
+#line 49 "src/sscan.l"
 return OPENPOINT;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 50 "sscan.l"
+#line 50 "src/sscan.l"
 return CLOSEPOINT;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 51 "sscan.l"
+#line 51 "src/sscan.l"
 return OPENARR;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 52 "sscan.l"
+#line 52 "src/sscan.l"
 return CLOSEARR;
 	YY_BREAK
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 53 "sscan.l"
+#line 53 "src/sscan.l"
 /* discard spaces */
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 54 "sscan.l"
+#line 54 "src/sscan.l"
 /* alert parser of the garbage */
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 55 "sscan.l"
+#line 55 "src/sscan.l"
 ECHO;
 	YY_BREAK
-#line 1121 "sscan.c"
+#line 1121 "src/sscan.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2086,6 +2086,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 55 "sscan.l"
+#line 55 "src/sscan.l"