Rearrange rpms and add debug output