Restructured and fixed gem versions for iso build again