Pushing restructure updates. Started construction of the engine proper