changes to package structure and install.sh