Moved any data around the engine into a common, shared, static class.
Moved shape data into their own package.