Put Wait class in separate file