Moving implicit waits implementation to a more appropriate package