Added new simulator, removed extra Offset directories