Removing empty bin folder
Introducing the StateGuard