Updated Files. Began refactoring the engine.
Finished refactoring the engine.