finishing multitenant architecture refactoring