Making all new classes package private
Moving static ui package
Bumping timeouts
Adding config option for retained stages
One more private class