Refactor submission #1

-Removed e prefix from core classes.
-Moved old e prefix files to TBD folder for review and checking.