Proper install script, various file moves