Actually updated file structure and install script to match README