Cleaned up engine
Refactored packages
Began framework for engine