Major re-org to work better with gui and not need internet for install