From 5ba0e3bcc70b9cb885ae7666733f28fcacbcc393 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@moleman>
Date: Thu, 25 Jul 2013 09:42:02 -0500
Subject: [PATCH] Reorganize code to ensure files are not too wide for prodos

---
 Make.engine                          | 46 ++++++++++++++++++++++++
 Make.mac                             | 13 +++++++
 Makefile                             | 52 ++++------------------------
 abCalcError.c => abCError.c          |  4 +--
 abCalcError.h => abCError.h          |  6 ++--
 abCalcMain.c => abCMain.c            | 10 +++---
 abCalcMode.c => abCMode.c            |  4 +--
 abCalcMode.h => abCMode.h            |  8 ++---
 abCalcStack.c => abCStack.c          |  6 ++--
 abCalcStack.h => abCStack.h          |  8 ++---
 abCalc.c                             | 14 ++++----
 abCalcExpReal.c => expr/abCExpReal.c |  4 +--
 abCalcExpReal.h => expr/abCExpReal.h |  6 ++--
 abCalcExpr.c => expr/abCExpr.c       |  4 +--
 abCalcExpr.h => expr/abCExpr.h       |  6 ++--
 abCalcExprInt.c => expr/abCExprInt.c |  6 ++--
 abCalcExprInt.h => expr/abCExprInt.h |  6 ++--
 abCalcOp.c => ops/abCOp.c            | 50 +++++++++++++-------------
 abCalcOp.h => ops/abCOp.h            |  6 ++--
 abCalcOpAdd.c => ops/abCOpAdd.c      | 16 ++++-----
 abCalcOpAdd.h => ops/abCOpAdd.h      |  6 ++--
 abCalcOpAnd.c => ops/abCOpAnd.c      | 14 ++++----
 abCalcOpAnd.h => ops/abCOpAnd.h      |  6 ++--
 abCalcOpAsr.c => ops/abCOpAsr.c      | 16 ++++-----
 abCalcOpAsr.h => ops/abCOpAsr.h      |  6 ++--
 abCalcOpBin.c => ops/abCOpBin.c      |  8 ++---
 abCalcOpBin.h => ops/abCOpBin.h      |  6 ++--
 abCalcOpDec.c => ops/abCOpDec.c      |  8 ++---
 abCalcOpDec.h => ops/abCOpDec.h      |  6 ++--
 abCalcOpDiv.c => ops/abCOpDiv.c      | 16 ++++-----
 abCalcOpDiv.h => ops/abCOpDiv.h      |  6 ++--
 abCalcOpHex.c => ops/abCOpHex.c      |  8 ++---
 abCalcOpHex.h => ops/abCOpHex.h      |  6 ++--
 abCalcOpMult.c => ops/abCOpMult.c    | 16 ++++-----
 abCalcOpMult.h => ops/abCOpMult.h    |  6 ++--
 abCalcOpNot.c => ops/abCOpNot.c      | 14 ++++----
 abCalcOpNot.h => ops/abCOpNot.h      |  6 ++--
 abCalcOpOct.c => ops/abCOpOct.c      |  8 ++---
 abCalcOpOct.h => ops/abCOpOct.h      |  6 ++--
 abCalcOpOr.c => ops/abCOpOr.c        | 14 ++++----
 abCalcOpOr.h => ops/abCOpOr.h        |  6 ++--
 abCalcOpPower.c => ops/abCOpPower.c  | 14 ++++----
 abCalcOpPower.h => ops/abCOpPower.h  |  6 ++--
 abCalcOpRcws.c => ops/abCOpRcws.c    | 14 ++++----
 abCalcOpRcws.h => ops/abCOpRcws.h    |  6 ++--
 abCalcOpRl.c => ops/abCOpRl.c        | 16 ++++-----
 abCalcOpRl.h => ops/abCOpRl.h        |  6 ++--
 abCalcOpRr.c => ops/abCOpRr.c        | 16 ++++-----
 abCalcOpRr.h => ops/abCOpRr.h        |  6 ++--
 abCalcOpSl.c => ops/abCOpSl.c        | 14 ++++----
 abCalcOpSl.h => ops/abCOpSl.h        |  6 ++--
 abCalcOpSr.c => ops/abCOpSr.c        | 14 ++++----
 abCalcOpSr.h => ops/abCOpSr.h        |  6 ++--
 abCalcOpStws.c => ops/abCOpStws.c    | 14 ++++----
 abCalcOpStws.h => ops/abCOpStws.h    |  6 ++--
 abCalcOpSubtr.c => ops/abCOpSubtr.c  | 16 ++++-----
 abCalcOpSubtr.h => ops/abCOpSubtr.h  |  6 ++--
 abCalcOpXor.c => ops/abCOpXor.c      | 14 ++++----
 abCalcOpXor.h => ops/abCOpXor.h      |  6 ++--
 59 files changed, 335 insertions(+), 314 deletions(-)
 create mode 100644 Make.engine
 create mode 100644 Make.mac
 rename abCalcError.c => abCError.c (97%)
 rename abCalcError.h => abCError.h (89%)
 rename abCalcMain.c => abCMain.c (93%)
 rename abCalcMode.c => abCMode.c (93%)
 rename abCalcMode.h => abCMode.h (84%)
 rename abCalcStack.c => abCStack.c (94%)
 rename abCalcStack.h => abCStack.h (74%)
 rename abCalcExpReal.c => expr/abCExpReal.c (98%)
 rename abCalcExpReal.h => expr/abCExpReal.h (71%)
 rename abCalcExpr.c => expr/abCExpr.c (96%)
 rename abCalcExpr.h => expr/abCExpr.h (94%)
 rename abCalcExprInt.c => expr/abCExprInt.c (98%)
 rename abCalcExprInt.h => expr/abCExprInt.h (70%)
 rename abCalcOp.c => ops/abCOp.c (65%)
 rename abCalcOp.h => ops/abCOp.h (95%)
 rename abCalcOpAdd.c => ops/abCOpAdd.c (86%)
 rename abCalcOpAdd.h => ops/abCOpAdd.h (54%)
 rename abCalcOpAnd.c => ops/abCOpAnd.c (80%)
 rename abCalcOpAnd.h => ops/abCOpAnd.h (54%)
 rename abCalcOpAsr.c => ops/abCOpAsr.c (77%)
 rename abCalcOpAsr.h => ops/abCOpAsr.h (54%)
 rename abCalcOpBin.c => ops/abCOpBin.c (74%)
 rename abCalcOpBin.h => ops/abCOpBin.h (54%)
 rename abCalcOpDec.c => ops/abCOpDec.c (74%)
 rename abCalcOpDec.h => ops/abCOpDec.h (54%)
 rename abCalcOpDiv.c => ops/abCOpDiv.c (88%)
 rename abCalcOpDiv.h => ops/abCOpDiv.h (54%)
 rename abCalcOpHex.c => ops/abCOpHex.c (74%)
 rename abCalcOpHex.h => ops/abCOpHex.h (54%)
 rename abCalcOpMult.c => ops/abCOpMult.c (86%)
 rename abCalcOpMult.h => ops/abCOpMult.h (53%)
 rename abCalcOpNot.c => ops/abCOpNot.c (75%)
 rename abCalcOpNot.h => ops/abCOpNot.h (54%)
 rename abCalcOpOct.c => ops/abCOpOct.c (74%)
 rename abCalcOpOct.h => ops/abCOpOct.h (54%)
 rename abCalcOpOr.c => ops/abCOpOr.c (80%)
 rename abCalcOpOr.h => ops/abCOpOr.h (54%)
 rename abCalcOpPower.c => ops/abCOpPower.c (88%)
 rename abCalcOpPower.h => ops/abCOpPower.h (52%)
 rename abCalcOpRcws.c => ops/abCOpRcws.c (67%)
 rename abCalcOpRcws.h => ops/abCOpRcws.h (53%)
 rename abCalcOpRl.c => ops/abCOpRl.c (77%)
 rename abCalcOpRl.h => ops/abCOpRl.h (54%)
 rename abCalcOpRr.c => ops/abCOpRr.c (77%)
 rename abCalcOpRr.h => ops/abCOpRr.h (54%)
 rename abCalcOpSl.c => ops/abCOpSl.c (75%)
 rename abCalcOpSl.h => ops/abCOpSl.h (54%)
 rename abCalcOpSr.c => ops/abCOpSr.c (75%)
 rename abCalcOpSr.h => ops/abCOpSr.h (54%)
 rename abCalcOpStws.c => ops/abCOpStws.c (79%)
 rename abCalcOpStws.h => ops/abCOpStws.h (53%)
 rename abCalcOpSubtr.c => ops/abCOpSubtr.c (86%)
 rename abCalcOpSubtr.h => ops/abCOpSubtr.h (52%)
 rename abCalcOpXor.c => ops/abCOpXor.c (80%)
 rename abCalcOpXor.h => ops/abCOpXor.h (54%)

diff --git a/Make.engine b/Make.engine
new file mode 100644
index 0000000..8dac7fe
--- /dev/null
+++ b/Make.engine
@@ -0,0 +1,46 @@
+OBJS=abCalc.o expr/abCExpr.o expr/abCExpReal.o expr/abCExprInt.o abCStack.o \
+    abCMode.o abCMain.o ops/abCOp.o abCError.o ops/abCOpAdd.o \
+    ops/abCOpSubtr.o ops/abCOpMult.o ops/abCOpDiv.o ops/abCOpPower.o \
+    ops/abCOpAnd.o ops/abCOpOr.o ops/abCOpXor.o ops/abCOpNot.o \
+    ops/abCOpBin.o ops/abCOpOct.o ops/abCOpDec.o ops/abCOpHex.o ops/abCOpStws.o \
+    ops/abCOpRcws.o ops/abCOpSl.o ops/abCOpRl.o ops/abCOpSr.o ops/abCOpRr.o \
+    ops/abCOpAsr.o
+
+abCMain.o: abCalc.h abCStack.h expr/abCExpr.h ops/abCOp.h abCError.h
+
+abCalc.o: abCalc.h expr/abCExpr.h abCMode.h expr/abCExpReal.h expr/abCExprInt.h \
+    abCStack.h ops/abCOp.h abCError.h
+abCStack.o: expr/abCExpr.h abCStack.h abCError.h
+abCMode.o: abCMode.h expr/abCExpr.h
+abCError.o: abCError.h
+
+expr/abCExpr.o: expr/abCExpr.h
+expr/abCExpReal.o: expr/abCExpr.h expr/abCExpReal.h
+expr/abCExprInt.o: expr/abCExpr.h abCMode.h expr/abCExprInt.h
+
+ops/abCOp.o: ops/abCOp.h abCError.h expr/abCExpr.h abCStack.h ops/abCOpAdd.h \
+    ops/abCOpSubtr.h ops/abCOpMult.h ops/abCOpDiv.h ops/abCOpPower.h \
+    ops/abCOpAnd.h ops/abCOpOr.h ops/abCOpXor.h ops/abCOpNot.h ops/abCOpBin.h \
+    ops/abCOpOct.h ops/abCOpDec.h ops/abCOpHex.h ops/abCOpStws.h ops/abCOpRcws.h \
+    ops/abCOpSl.h ops/abCOpRl.h ops/abCOpSr.h ops/abCOpRr.h ops/abCOpAsr.h
+ops/abCOpAdd.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpAdd.h
+ops/abCOpSubtr.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpSubtr.h
+ops/abCOpMult.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpMult.h
+ops/abCOpDiv.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h expr/abCExprInt.h abCStack.h ops/abCOpDiv.h
+ops/abCOpPower.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExpReal.h abCStack.h ops/abCOpPower.h
+ops/abCOpAnd.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpAnd.h
+ops/abCOpOr.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpOr.h
+ops/abCOpXor.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpXor.h
+ops/abCOpNot.o: ops/abCOp.h abCError.h expr/abCExpr.h expr/abCExprInt.h abCStack.h ops/abCOpNot.h
+ops/abCOpBin.o: ops/abCOp.h abCMode.h ops/abCOpBin.h
+ops/abCOpOct.o: ops/abCOp.h abCMode.h ops/abCOpOct.h
+ops/abCOpDec.o: ops/abCOp.h abCMode.h ops/abCOpDec.h
+ops/abCOpHex.o: ops/abCOp.h abCMode.h ops/abCOpHex.h
+ops/abCOpStws.o: ops/abCOp.h abCMode.h abCStack.h expr/abCExpr.h abCError.h ops/abCOpStws.h
+ops/abCOpRcws.o: ops/abCOp.h abCMode.h abCStack.h expr/abCExpr.h expr/abCExpReal.h ops/abCOpRcws.h
+ops/abCOpSl.o: ops/abCOp.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpSl.h
+ops/abCOpRl.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpRl.h
+ops/abCOpSr.o: ops/abCOp.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpSr.h
+ops/abCOpRr.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpRr.h
+ops/abCOpAsr.o: ops/abCOp.h abCMode.h abCError.h abCStack.h expr/abCExpr.h expr/abCExprInt.h ops/abCOpAsr.h
+
diff --git a/Make.mac b/Make.mac
new file mode 100644
index 0000000..f1bdf8f
--- /dev/null
+++ b/Make.mac
@@ -0,0 +1,13 @@
+NAME=abCalc
+
+CFLAGS=-Iexpr -Iops -I.
+
+all: $(NAME)
+
+include Make.engine
+
+$(NAME): $(OBJS)
+	cc -o $(NAME) $(OBJS)
+
+clean:
+	rm -f $(NAME) $(OBJS)
diff --git a/Makefile b/Makefile
index 0527b95..6df2b2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,15 @@
-OBJS=abCalc.o abCalcExpr.o abCalcExpReal.o abCalcExprInt.o abCalcStack.o \
-    abCalcMode.o abCalcMain.o abCalcOp.o abCalcError.o abCalcOpAdd.o \
-    abCalcOpSubtr.o abCalcOpMult.o abCalcOpDiv.o abCalcOpPower.o \
-    abCalcOpAnd.o abCalcOpOr.o abCalcOpXor.o abCalcOpNot.o \
-    abCalcOpBin.o abCalcOpOct.o abCalcOpDec.o abCalcOpHex.o abCalcOpStws.o \
-    abCalcOpRcws.o abCalcOpSl.o abCalcOpRl.o abCalcOpSr.o abCalcOpRr.o \
-    abCalcOpAsr.o
-
 NAME=abCalc
 
 all: $(NAME)
 
-abCalcExpr.o: abCalcExpr.h
-abCalcExpReal.o: abCalcExpr.h abCalcExpReal.h
-abCalcExprInt.o: abCalcExpr.h abCalcMode.h abCalcExprInt.h
-abCalcStack.o: abCalcExpr.h abCalcStack.h abCalcError.h
-abCalcMode.o: abCalcMode.h abCalcExpr.h
-abCalcError.o: abCalcError.h
-abCalc.o: abCalc.h abCalcExpr.h abCalcMode.h abCalcExpReal.h abCalcExprInt.h \
-    abCalcStack.h abCalcOp.h abCalcError.h
-abCalcMain.o: abCalc.h abCalcStack.h abCalcExpr.h abCalcOp.h abCalcError.h
-abCalcOp.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcStack.h abCalcOpAdd.h \
-    abCalcOpSubtr.h abCalcOpMult.h abCalcOpDiv.h abCalcOpPower.h \
-    abCalcOpAnd.h abCalcOpOr.h abCalcOpXor.h abCalcOpNot.h abCalcOpBin.h \
-    abCalcOpOct.h abCalcOpDec.h abCalcOpHex.h abCalcOpStws.h abCalcOpRcws.h \
-    abCalcOpSl.h abCalcOpRl.h abCalcOpSr.h abCalcOpRr.h abCalcOpAsr.h
-abCalcOpAdd.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpAdd.h
-abCalcOpSubtr.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpSubtr.h
-abCalcOpMult.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpMult.h
-abCalcOpDiv.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcExprInt.h abCalcStack.h abCalcOpDiv.h
-abCalcOpPower.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExpReal.h abCalcStack.h abCalcOpPower.h
-abCalcOpAnd.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpAnd.h
-abCalcOpOr.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpOr.h
-abCalcOpXor.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpXor.h
-abCalcOpNot.o: abCalcOp.h abCalcError.h abCalcExpr.h abCalcExprInt.h abCalcStack.h abCalcOpNot.h
-abCalcOpBin.o: abCalcOp.h abCalcMode.h abCalcOpBin.h
-abCalcOpOct.o: abCalcOp.h abCalcMode.h abCalcOpOct.h
-abCalcOpDec.o: abCalcOp.h abCalcMode.h abCalcOpDec.h
-abCalcOpHex.o: abCalcOp.h abCalcMode.h abCalcOpHex.h
-abCalcOpStws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcError.h abCalcOpStws.h
-abCalcOpRcws.o: abCalcOp.h abCalcMode.h abCalcStack.h abCalcExpr.h abCalcExpReal.h abCalcOpRcws.h
-abCalcOpSl.o: abCalcOp.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpSl.h
-abCalcOpRl.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpRl.h
-abCalcOpSr.o: abCalcOp.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpSr.h
-abCalcOpRr.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpRr.h
-abCalcOpAsr.o: abCalcOp.h abCalcMode.h abCalcError.h abCalcStack.h abCalcExpr.h abCalcExprInt.h abCalcOpAsr.h
-
+.INCLUDE: "Make.engine"
 
 $(NAME): $(OBJS)
-	cc -o $(NAME) $(OBJS)
+	occ -o $(NAME) $(OBJS)
 
 clean:
-	rm -f $(NAME) $(OBJS)
+	cp -p rm -f $(NAME) $(OBJS) $(NAME).r $(NAME).root
+
+%.o: %.c
+	chtyp -l CC $<
+	occ -c $<
diff --git a/abCalcError.c b/abCError.c
similarity index 97%
rename from abCalcError.c
rename to abCError.c
index dbacf38..f45b248 100644
--- a/abCalcError.c
+++ b/abCError.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcError.c
+    abCError.c
         By: Jeremy Rand
  */
 
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "abCalcError.h"
+#include "abCError.h"
 
 
 static char *gErrorStrings[abCalcErrorTypeMax];
diff --git a/abCalcError.h b/abCError.h
similarity index 89%
rename from abCalcError.h
rename to abCError.h
index aa7f396..bf6fad0 100644
--- a/abCalcError.h
+++ b/abCError.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcError.h
+    abCError.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCERROR_H
-#define ABCALCERROR_H
+#ifndef ABCERROR_H
+#define ABCERROR_H
 
 
 typedef enum abCalcErrorType {
diff --git a/abCalcMain.c b/abCMain.c
similarity index 93%
rename from abCalcMain.c
rename to abCMain.c
index 489647f..08f99fc 100644
--- a/abCalcMain.c
+++ b/abCMain.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcMain.c
+    abCMain.c
         By: Jeremy Rand
  */
 
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 
 #include "abCalc.h"
-#include "abCalcExpr.h"
-#include "abCalcStack.h"
-#include "abCalcOp.h"
-#include "abCalcError.h"
+#include "abCExpr.h"
+#include "abCStack.h"
+#include "abCOp.h"
+#include "abCError.h"
 
 
 char gBuffer[AB_CALC_EXPR_STRING_MAX];
diff --git a/abCalcMode.c b/abCMode.c
similarity index 93%
rename from abCalcMode.c
rename to abCMode.c
index 4e64dce..987875d 100644
--- a/abCalcMode.c
+++ b/abCMode.c
@@ -1,10 +1,10 @@
 /* 
-    abCalcMode.c
+    abCMode.c
         By: Jeremy Rand
  */
 
 
-#include "abCalcMode.h"
+#include "abCMode.h"
 
 
 
diff --git a/abCalcMode.h b/abCMode.h
similarity index 84%
rename from abCalcMode.h
rename to abCMode.h
index 344b70c..5a431ce 100644
--- a/abCalcMode.h
+++ b/abCMode.h
@@ -1,14 +1,14 @@
 /* 
-    abCalcMode.h
+    abCMode.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCMODE_H
-#define ABCALCMODE_H
+#ifndef ABCMODE_H
+#define ABCMODE_H
 
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 typedef enum abCalcModeIntBase
diff --git a/abCalcStack.c b/abCStack.c
similarity index 94%
rename from abCalcStack.c
rename to abCStack.c
index 5d7216d..197d7a9 100644
--- a/abCalcStack.c
+++ b/abCStack.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcStack.c
+    abCStack.c
         By: Jeremy Rand
  */
 
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "abCalcStack.h"
-#include "abCalcError.h"
+#include "abCStack.h"
+#include "abCError.h"
 
 
 #define AB_CALC_STACK_DEPTH 128
diff --git a/abCalcStack.h b/abCStack.h
similarity index 74%
rename from abCalcStack.h
rename to abCStack.h
index 9e7dba3..54c4348 100644
--- a/abCalcStack.h
+++ b/abCStack.h
@@ -1,14 +1,14 @@
 /* 
-    abCalcStack.h
+    abCStack.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCSTACK_H
-#define ABCALCSTACK_H
+#ifndef ABCSTACK_H
+#define ABCSTACK_H
 
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 void abCalcStackInit(void);
 
diff --git a/abCalc.c b/abCalc.c
index a48e4df..e74b485 100644
--- a/abCalc.c
+++ b/abCalc.c
@@ -4,13 +4,13 @@
  */
 
 
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcExpReal.h"
-#include "abCalcMode.h"
-#include "abCalcStack.h"
-#include "abCalcOp.h"
-#include "abCalcError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCExpReal.h"
+#include "abCMode.h"
+#include "abCStack.h"
+#include "abCOp.h"
+#include "abCError.h"
 
 
 void abCalcInit(void)
diff --git a/abCalcExpReal.c b/expr/abCExpReal.c
similarity index 98%
rename from abCalcExpReal.c
rename to expr/abCExpReal.c
index 405e162..1597d05 100644
--- a/abCalcExpReal.c
+++ b/expr/abCExpReal.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcExpReal.c
+    abCExpReal.c
         By: Jeremy Rand
  */
 
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 static abCalcExpr *abCalcExprRealParse(abCalcExpr *expr, char *buffer);
diff --git a/abCalcExpReal.h b/expr/abCExpReal.h
similarity index 71%
rename from abCalcExpReal.h
rename to expr/abCExpReal.h
index 8fbd45c..8bf5888 100644
--- a/abCalcExpReal.h
+++ b/expr/abCExpReal.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcExpReal.h
+    abCExpReal.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPREAL_H
-#define ABCALCEXPREAL_H
+#ifndef ABCEXPREAL_H
+#define ABCEXPREAL_H
 
 
 struct abCalcExpr;
diff --git a/abCalcExpr.c b/expr/abCExpr.c
similarity index 96%
rename from abCalcExpr.c
rename to expr/abCExpr.c
index dd8ffb8..d2847e8 100644
--- a/abCalcExpr.c
+++ b/expr/abCExpr.c
@@ -1,12 +1,12 @@
 /* 
-    abCalcExpr.c
+    abCExpr.c
         By: Jeremy Rand
  */
 
 
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
+#include "abCExpr.h"
 
 
 static abCalcExprCallbacks *gCallbacks[abCalcExprTypeMax];
diff --git a/abCalcExpr.h b/expr/abCExpr.h
similarity index 94%
rename from abCalcExpr.h
rename to expr/abCExpr.h
index 0e1feec..029298c 100644
--- a/abCalcExpr.h
+++ b/expr/abCExpr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcExpr.h
+    abCExpr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPR_H
-#define ABCALCEXPR_H
+#ifndef ABCEXPR_H
+#define ABCEXPR_H
 
 
 typedef enum abCalcExprType {
diff --git a/abCalcExprInt.c b/expr/abCExprInt.c
similarity index 98%
rename from abCalcExprInt.c
rename to expr/abCExprInt.c
index 9a66cd8..f0cbf71 100644
--- a/abCalcExprInt.c
+++ b/expr/abCExprInt.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcExprInt.c
+    abCExprInt.c
         By: Jeremy Rand
  */
 
@@ -8,8 +8,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "abCalcExpr.h"
-#include "abCalcMode.h"
+#include "abCExpr.h"
+#include "abCMode.h"
 
 
 static abCalcExpr *abCalcExprIntParse(abCalcExpr *expr, char *buffer);
diff --git a/abCalcExprInt.h b/expr/abCExprInt.h
similarity index 70%
rename from abCalcExprInt.h
rename to expr/abCExprInt.h
index 9c96816..7d08525 100644
--- a/abCalcExprInt.h
+++ b/expr/abCExprInt.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcExprInt.h
+    abCExprInt.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCEXPRINT_H
-#define ABCALCEXPRINT_H
+#ifndef ABCEXPRINT_H
+#define ABCEXPRINT_H
 
 
 struct abCalcExpr;
diff --git a/abCalcOp.c b/ops/abCOp.c
similarity index 65%
rename from abCalcOp.c
rename to ops/abCOp.c
index ab2a852..cb725fb 100644
--- a/abCalcOp.c
+++ b/ops/abCOp.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcOp.c
+    abCOp.c
         By: Jeremy Rand
  */
 
@@ -7,33 +7,33 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "abCalcOp.h"
-#include "abCalcExpr.h"
-#include "abCalcError.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCExpr.h"
+#include "abCError.h"
+#include "abCStack.h"
 
-#include "abCalcOpAdd.h"
-#include "abCalcOpSubtr.h"
-#include "abCalcOpMult.h"
-#include "abCalcOpDiv.h"
-#include "abCalcOpPower.h"
+#include "abCOpAdd.h"
+#include "abCOpSubtr.h"
+#include "abCOpMult.h"
+#include "abCOpDiv.h"
+#include "abCOpPower.h"
 
-#include "abCalcOpAnd.h"
-#include "abCalcOpOr.h"
-#include "abCalcOpXor.h"
-#include "abCalcOpNot.h"
-#include "abCalcOpSl.h"
-#include "abCalcOpRl.h"
-#include "abCalcOpSr.h"
-#include "abCalcOpRr.h"
-#include "abCalcOpAsr.h"
+#include "abCOpAnd.h"
+#include "abCOpOr.h"
+#include "abCOpXor.h"
+#include "abCOpNot.h"
+#include "abCOpSl.h"
+#include "abCOpRl.h"
+#include "abCOpSr.h"
+#include "abCOpRr.h"
+#include "abCOpAsr.h"
 
-#include "abCalcOpBin.h"
-#include "abCalcOpOct.h"
-#include "abCalcOpDec.h"
-#include "abCalcOpHex.h"
-#include "abCalcOpStws.h"
-#include "abCalcOpRcws.h"
+#include "abCOpBin.h"
+#include "abCOpOct.h"
+#include "abCOpDec.h"
+#include "abCOpHex.h"
+#include "abCOpStws.h"
+#include "abCOpRcws.h"
 
 
 #define AB_CALC_MAX_OPS 128
diff --git a/abCalcOp.h b/ops/abCOp.h
similarity index 95%
rename from abCalcOp.h
rename to ops/abCOp.h
index 2f575ee..8396451 100644
--- a/abCalcOp.h
+++ b/ops/abCOp.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOp.h
+    abCOp.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOP_H
-#define ABCALCOP_H
+#ifndef ABCOP_H
+#define ABCOP_H
 
 
 #define AB_CALC_OP_ONE_ARG(opName)                       \
diff --git a/abCalcOpAdd.c b/ops/abCOpAdd.c
similarity index 86%
rename from abCalcOpAdd.c
rename to ops/abCOpAdd.c
index 71f1a15..ab987a5 100644
--- a/abCalcOpAdd.c
+++ b/ops/abCOpAdd.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpAdd.c
+    abCOpAdd.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAdd.h"
+#include "abCOpAdd.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "+"
diff --git a/abCalcOpAdd.h b/ops/abCOpAdd.h
similarity index 54%
rename from abCalcOpAdd.h
rename to ops/abCOpAdd.h
index e7dd11b..cc3319d 100644
--- a/abCalcOpAdd.h
+++ b/ops/abCOpAdd.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAdd.h
+    abCOpAdd.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPADD_H
-#define ABCALCOPADD_H
+#ifndef ABCOPADD_H
+#define ABCOPADD_H
 
 
 void abCalcOpAddInit(void);
diff --git a/abCalcOpAnd.c b/ops/abCOpAnd.c
similarity index 80%
rename from abCalcOpAnd.c
rename to ops/abCOpAnd.c
index f546890..46270b8 100644
--- a/abCalcOpAnd.c
+++ b/ops/abCOpAnd.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpAnd.c
+    abCOpAnd.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAnd.h"
+#include "abCOpAnd.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "AND"
diff --git a/abCalcOpAnd.h b/ops/abCOpAnd.h
similarity index 54%
rename from abCalcOpAnd.h
rename to ops/abCOpAnd.h
index be54b3c..27a0610 100644
--- a/abCalcOpAnd.h
+++ b/ops/abCOpAnd.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAnd.h
+    abCOpAnd.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPAND_H
-#define ABCALCOPAND_H
+#ifndef ABCOPAND_H
+#define ABCOPAND_H
 
 
 void abCalcOpAndInit(void);
diff --git a/abCalcOpAsr.c b/ops/abCOpAsr.c
similarity index 77%
rename from abCalcOpAsr.c
rename to ops/abCOpAsr.c
index cf9f1fc..d75681f 100644
--- a/abCalcOpAsr.c
+++ b/ops/abCOpAsr.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpAsr.c
+    abCOpAsr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpAsr.h"
+#include "abCOpAsr.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcMode.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCMode.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "ASR"
diff --git a/abCalcOpAsr.h b/ops/abCOpAsr.h
similarity index 54%
rename from abCalcOpAsr.h
rename to ops/abCOpAsr.h
index eec3a84..a796c1a 100644
--- a/abCalcOpAsr.h
+++ b/ops/abCOpAsr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpAsr.h
+    abCOpAsr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPASR_H
-#define ABCALCOPASR_H
+#ifndef ABCOPASR_H
+#define ABCOPASR_H
 
 
 void abCalcOpAsrInit(void);
diff --git a/abCalcOpBin.c b/ops/abCOpBin.c
similarity index 74%
rename from abCalcOpBin.c
rename to ops/abCOpBin.c
index 657025a..f78b11f 100644
--- a/abCalcOpBin.c
+++ b/ops/abCOpBin.c
@@ -1,15 +1,15 @@
 /* 
-    abCalcOpBin.c
+    abCOpBin.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpBin.h"
+#include "abCOpBin.h"
 
-#include "abCalcOp.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "BIN"
diff --git a/abCalcOpBin.h b/ops/abCOpBin.h
similarity index 54%
rename from abCalcOpBin.h
rename to ops/abCOpBin.h
index f517b46..15126a2 100644
--- a/abCalcOpBin.h
+++ b/ops/abCOpBin.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpBin.h
+    abCOpBin.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPBIN_H
-#define ABCALCOPBIN_H
+#ifndef ABCOPBIN_H
+#define ABCOPBIN_H
 
 
 void abCalcOpBinInit(void);
diff --git a/abCalcOpDec.c b/ops/abCOpDec.c
similarity index 74%
rename from abCalcOpDec.c
rename to ops/abCOpDec.c
index 5870354..a6a5ee0 100644
--- a/abCalcOpDec.c
+++ b/ops/abCOpDec.c
@@ -1,15 +1,15 @@
 /* 
-    abCalcOpDec.c
+    abCOpDec.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpDec.h"
+#include "abCOpDec.h"
 
-#include "abCalcOp.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "DEC"
diff --git a/abCalcOpDec.h b/ops/abCOpDec.h
similarity index 54%
rename from abCalcOpDec.h
rename to ops/abCOpDec.h
index 4a598a5..f47057a 100644
--- a/abCalcOpDec.h
+++ b/ops/abCOpDec.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpDec.h
+    abCOpDec.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPDEC_H
-#define ABCALCOPDEC_H
+#ifndef ABCOPDEC_H
+#define ABCOPDEC_H
 
 
 void abCalcOpDecInit(void);
diff --git a/abCalcOpDiv.c b/ops/abCOpDiv.c
similarity index 88%
rename from abCalcOpDiv.c
rename to ops/abCOpDiv.c
index 06d1cd2..f30bf82 100644
--- a/abCalcOpDiv.c
+++ b/ops/abCOpDiv.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpDiv.c
+    abCOpDiv.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpDiv.h"
+#include "abCOpDiv.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "/"
diff --git a/abCalcOpDiv.h b/ops/abCOpDiv.h
similarity index 54%
rename from abCalcOpDiv.h
rename to ops/abCOpDiv.h
index a668b2b..24f10dd 100644
--- a/abCalcOpDiv.h
+++ b/ops/abCOpDiv.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpDiv.h
+    abCOpDiv.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPDIV_H
-#define ABCALCOPDIV_H
+#ifndef ABCOPDIV_H
+#define ABCOPDIV_H
 
 
 void abCalcOpDivInit(void);
diff --git a/abCalcOpHex.c b/ops/abCOpHex.c
similarity index 74%
rename from abCalcOpHex.c
rename to ops/abCOpHex.c
index 4c86a78..e9898ac 100644
--- a/abCalcOpHex.c
+++ b/ops/abCOpHex.c
@@ -1,15 +1,15 @@
 /* 
-    abCalcOpHex.c
+    abCOpHex.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpHex.h"
+#include "abCOpHex.h"
 
-#include "abCalcOp.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "HEX"
diff --git a/abCalcOpHex.h b/ops/abCOpHex.h
similarity index 54%
rename from abCalcOpHex.h
rename to ops/abCOpHex.h
index f5d55c3..8471eb0 100644
--- a/abCalcOpHex.h
+++ b/ops/abCOpHex.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpHex.h
+    abCOpHex.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPHEX_H
-#define ABCALCOPHEX_H
+#ifndef ABCOPHEX_H
+#define ABCOPHEX_H
 
 
 void abCalcOpHexInit(void);
diff --git a/abCalcOpMult.c b/ops/abCOpMult.c
similarity index 86%
rename from abCalcOpMult.c
rename to ops/abCOpMult.c
index 5848ee3..5385db1 100644
--- a/abCalcOpMult.c
+++ b/ops/abCOpMult.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpMult.c
+    abCOpMult.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpMult.h"
+#include "abCOpMult.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "*"
diff --git a/abCalcOpMult.h b/ops/abCOpMult.h
similarity index 53%
rename from abCalcOpMult.h
rename to ops/abCOpMult.h
index 01f4253..b32db73 100644
--- a/abCalcOpMult.h
+++ b/ops/abCOpMult.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpMult.h
+    abCOpMult.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPMULT_H
-#define ABCALCOPMULT_H
+#ifndef ABCOPMULT_H
+#define ABCOPMULT_H
 
 
 void abCalcOpMultInit(void);
diff --git a/abCalcOpNot.c b/ops/abCOpNot.c
similarity index 75%
rename from abCalcOpNot.c
rename to ops/abCOpNot.c
index 24c3292..ce8d484 100644
--- a/abCalcOpNot.c
+++ b/ops/abCOpNot.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpNot.c
+    abCOpNot.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpNot.h"
+#include "abCOpNot.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "NOT"
diff --git a/abCalcOpNot.h b/ops/abCOpNot.h
similarity index 54%
rename from abCalcOpNot.h
rename to ops/abCOpNot.h
index fc78343..f7c90b0 100644
--- a/abCalcOpNot.h
+++ b/ops/abCOpNot.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpNot.h
+    abCOpNot.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPNOT_H
-#define ABCALCOPNOT_H
+#ifndef ABCOPNOT_H
+#define ABCOPNOT_H
 
 
 void abCalcOpNotInit(void);
diff --git a/abCalcOpOct.c b/ops/abCOpOct.c
similarity index 74%
rename from abCalcOpOct.c
rename to ops/abCOpOct.c
index c9b3c67..da058a8 100644
--- a/abCalcOpOct.c
+++ b/ops/abCOpOct.c
@@ -1,15 +1,15 @@
 /* 
-    abCalcOpOct.c
+    abCOpOct.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpOct.h"
+#include "abCOpOct.h"
 
-#include "abCalcOp.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "OCT"
diff --git a/abCalcOpOct.h b/ops/abCOpOct.h
similarity index 54%
rename from abCalcOpOct.h
rename to ops/abCOpOct.h
index b4838c1..6fac438 100644
--- a/abCalcOpOct.h
+++ b/ops/abCOpOct.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpOct.h
+    abCOpOct.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPOCT_H
-#define ABCALCOPOCT_H
+#ifndef ABCOPOCT_H
+#define ABCOPOCT_H
 
 
 void abCalcOpOctInit(void);
diff --git a/abCalcOpOr.c b/ops/abCOpOr.c
similarity index 80%
rename from abCalcOpOr.c
rename to ops/abCOpOr.c
index 3617b6a..a83cf34 100644
--- a/abCalcOpOr.c
+++ b/ops/abCOpOr.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpOr.c
+    abCOpOr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpOr.h"
+#include "abCOpOr.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "OR"
diff --git a/abCalcOpOr.h b/ops/abCOpOr.h
similarity index 54%
rename from abCalcOpOr.h
rename to ops/abCOpOr.h
index c88aeb8..525968e 100644
--- a/abCalcOpOr.h
+++ b/ops/abCOpOr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpOr.h
+    abCOpOr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPOR_H
-#define ABCALCOPOR_H
+#ifndef ABCOPOR_H
+#define ABCOPOR_H
 
 
 void abCalcOpOrInit(void);
diff --git a/abCalcOpPower.c b/ops/abCOpPower.c
similarity index 88%
rename from abCalcOpPower.c
rename to ops/abCOpPower.c
index 6fb80b9..3347ef8 100644
--- a/abCalcOpPower.c
+++ b/ops/abCOpPower.c
@@ -1,5 +1,5 @@
 /* 
-    abCalcOpPower.c
+    abCOpPower.c
         By: Jeremy Rand
  */
 
@@ -7,13 +7,13 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "abCalcOpPower.h"
+#include "abCOpPower.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "^"
diff --git a/abCalcOpPower.h b/ops/abCOpPower.h
similarity index 52%
rename from abCalcOpPower.h
rename to ops/abCOpPower.h
index 92beb8b..df058fc 100644
--- a/abCalcOpPower.h
+++ b/ops/abCOpPower.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpPower.h
+    abCOpPower.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPPOWER_H
-#define ABCALCOPPOWER_H
+#ifndef ABCOPPOWER_H
+#define ABCOPPOWER_H
 
 
 void abCalcOpPowerInit(void);
diff --git a/abCalcOpRcws.c b/ops/abCOpRcws.c
similarity index 67%
rename from abCalcOpRcws.c
rename to ops/abCOpRcws.c
index 395146b..6052b6c 100644
--- a/abCalcOpRcws.c
+++ b/ops/abCOpRcws.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpRcws.c
+    abCOpRcws.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRcws.h"
+#include "abCOpRcws.h"
 
-#include "abCalcOp.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcStack.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCStack.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "RCWS"
diff --git a/abCalcOpRcws.h b/ops/abCOpRcws.h
similarity index 53%
rename from abCalcOpRcws.h
rename to ops/abCOpRcws.h
index 7556c01..b6f1ad3 100644
--- a/abCalcOpRcws.h
+++ b/ops/abCOpRcws.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRcws.h
+    abCOpRcws.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRCWS_H
-#define ABCALCOPRCWS_H
+#ifndef ABCOPRCWS_H
+#define ABCOPRCWS_H
 
 
 void abCalcOpRcwsInit(void);
diff --git a/abCalcOpRl.c b/ops/abCOpRl.c
similarity index 77%
rename from abCalcOpRl.c
rename to ops/abCOpRl.c
index dae081e..175e7c6 100644
--- a/abCalcOpRl.c
+++ b/ops/abCOpRl.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpRl.c
+    abCOpRl.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRl.h"
+#include "abCOpRl.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcMode.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCMode.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "RL"
diff --git a/abCalcOpRl.h b/ops/abCOpRl.h
similarity index 54%
rename from abCalcOpRl.h
rename to ops/abCOpRl.h
index e8e1919..463f867 100644
--- a/abCalcOpRl.h
+++ b/ops/abCOpRl.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRl.h
+    abCOpRl.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRL_H
-#define ABCALCOPRL_H
+#ifndef ABCOPRL_H
+#define ABCOPRL_H
 
 
 void abCalcOpRlInit(void);
diff --git a/abCalcOpRr.c b/ops/abCOpRr.c
similarity index 77%
rename from abCalcOpRr.c
rename to ops/abCOpRr.c
index 2ad3c7b..5b55209 100644
--- a/abCalcOpRr.c
+++ b/ops/abCOpRr.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpRr.c
+    abCOpRr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpRr.h"
+#include "abCOpRr.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcMode.h"
-#include "abCalcStack.h"
-#include "abCalcExprInt.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCMode.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "RR"
diff --git a/abCalcOpRr.h b/ops/abCOpRr.h
similarity index 54%
rename from abCalcOpRr.h
rename to ops/abCOpRr.h
index cc14457..6184ae9 100644
--- a/abCalcOpRr.h
+++ b/ops/abCOpRr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpRr.h
+    abCOpRr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPRR_H
-#define ABCALCOPRR_H
+#ifndef ABCOPRR_H
+#define ABCOPRR_H
 
 
 void abCalcOpRrInit(void);
diff --git a/abCalcOpSl.c b/ops/abCOpSl.c
similarity index 75%
rename from abCalcOpSl.c
rename to ops/abCOpSl.c
index 1d7f27d..1c7d7a7 100644
--- a/abCalcOpSl.c
+++ b/ops/abCOpSl.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpSl.c
+    abCOpSl.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSl.h"
+#include "abCOpSl.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "SL"
diff --git a/abCalcOpSl.h b/ops/abCOpSl.h
similarity index 54%
rename from abCalcOpSl.h
rename to ops/abCOpSl.h
index 7dd7884..e539b78 100644
--- a/abCalcOpSl.h
+++ b/ops/abCOpSl.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSl.h
+    abCOpSl.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSL_H
-#define ABCALCOPSL_H
+#ifndef ABCOPSL_H
+#define ABCOPSL_H
 
 
 void abCalcOpSlInit(void);
diff --git a/abCalcOpSr.c b/ops/abCOpSr.c
similarity index 75%
rename from abCalcOpSr.c
rename to ops/abCOpSr.c
index ba70833..6788346 100644
--- a/abCalcOpSr.c
+++ b/ops/abCOpSr.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpSr.c
+    abCOpSr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSr.h"
+#include "abCOpSr.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "SR"
diff --git a/abCalcOpSr.h b/ops/abCOpSr.h
similarity index 54%
rename from abCalcOpSr.h
rename to ops/abCOpSr.h
index 16243b0..fe41bd5 100644
--- a/abCalcOpSr.h
+++ b/ops/abCOpSr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSr.h
+    abCOpSr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSR_H
-#define ABCALCOPSR_H
+#ifndef ABCOPSR_H
+#define ABCOPSR_H
 
 
 void abCalcOpSrInit(void);
diff --git a/abCalcOpStws.c b/ops/abCOpStws.c
similarity index 79%
rename from abCalcOpStws.c
rename to ops/abCOpStws.c
index 0bc364d..1646e86 100644
--- a/abCalcOpStws.c
+++ b/ops/abCOpStws.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpStws.c
+    abCOpStws.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpStws.h"
+#include "abCOpStws.h"
 
-#include "abCalcOp.h"
-#include "abCalcExpr.h"
-#include "abCalcError.h"
-#include "abCalcStack.h"
-#include "abCalcMode.h"
+#include "abCOp.h"
+#include "abCExpr.h"
+#include "abCError.h"
+#include "abCStack.h"
+#include "abCMode.h"
 
 
 #define OP_NAME "STWS"
diff --git a/abCalcOpStws.h b/ops/abCOpStws.h
similarity index 53%
rename from abCalcOpStws.h
rename to ops/abCOpStws.h
index ff786eb..52e2120 100644
--- a/abCalcOpStws.h
+++ b/ops/abCOpStws.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpStws.h
+    abCOpStws.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSTWS_H
-#define ABCALCOPSTWS_H
+#ifndef ABCOPSTWS_H
+#define ABCOPSTWS_H
 
 
 void abCalcOpStwsInit(void);
diff --git a/abCalcOpSubtr.c b/ops/abCOpSubtr.c
similarity index 86%
rename from abCalcOpSubtr.c
rename to ops/abCOpSubtr.c
index 32ec4e0..7c264de 100644
--- a/abCalcOpSubtr.c
+++ b/ops/abCOpSubtr.c
@@ -1,19 +1,19 @@
 /* 
-    abCalcOpSubtr.c
+    abCOpSubtr.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpSubtr.h"
+#include "abCOpSubtr.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExpReal.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExpReal.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "-"
diff --git a/abCalcOpSubtr.h b/ops/abCOpSubtr.h
similarity index 52%
rename from abCalcOpSubtr.h
rename to ops/abCOpSubtr.h
index 37201a2..e2edefa 100644
--- a/abCalcOpSubtr.h
+++ b/ops/abCOpSubtr.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpSubtr.h
+    abCOpSubtr.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPSUBTR_H
-#define ABCALCOPSUBTR_H
+#ifndef ABCOPSUBTR_H
+#define ABCOPSUBTR_H
 
 
 void abCalcOpSubtrInit(void);
diff --git a/abCalcOpXor.c b/ops/abCOpXor.c
similarity index 80%
rename from abCalcOpXor.c
rename to ops/abCOpXor.c
index 3399d4c..a273a83 100644
--- a/abCalcOpXor.c
+++ b/ops/abCOpXor.c
@@ -1,18 +1,18 @@
 /* 
-    abCalcOpXor.c
+    abCOpXor.c
         By: Jeremy Rand
  */
 
 
 #include <stdio.h>
 
-#include "abCalcOpXor.h"
+#include "abCOpXor.h"
 
-#include "abCalcOp.h"
-#include "abCalcError.h"
-#include "abCalcExpr.h"
-#include "abCalcExprInt.h"
-#include "abCalcStack.h"
+#include "abCOp.h"
+#include "abCError.h"
+#include "abCExpr.h"
+#include "abCExprInt.h"
+#include "abCStack.h"
 
 
 #define OP_NAME "XOR"
diff --git a/abCalcOpXor.h b/ops/abCOpXor.h
similarity index 54%
rename from abCalcOpXor.h
rename to ops/abCOpXor.h
index 06dba2d..9b9b136 100644
--- a/abCalcOpXor.h
+++ b/ops/abCOpXor.h
@@ -1,11 +1,11 @@
 /* 
-    abCalcOpXor.h
+    abCOpXor.h
         By: Jeremy Rand
  */
 
 
-#ifndef ABCALCOPXOR_H
-#define ABCALCOPXOR_H
+#ifndef ABCOPXOR_H
+#define ABCOPXOR_H
 
 
 void abCalcOpXorInit(void);