Reverted water catcher large and small to original models, added hose input to both, cleaned up folders, set col and gibs to correct file setup