Instance restructure

Pulling changes introduced in https://github.com/ryansworld10/Escape/issues/4