Added package installation script and some cleanup