more reorgs
Merge branch 'waits' of https://github.com/Orasi/Java-Automation-Framework into stage