Improved deps and build
Refactored Options to Engine and added Base