Restructure installation and package generation