Object storage refactoring; StateMachime cleanup;