Renamings and tried to implement install generator