Moved some files around.
Well, the Arduino IDE is stupid with includes, so looks like code duplication is going to happen. *sigh*