A bunch of updates.
Moved core files into core directory.
All tests passing for simplify. (whoa) This calls for a version increment.