restructure prop file; add working dir, remove ssh password
conflicts resolved