Moved stuff around and improved deploy- and uninstall scripts