Made change to use more RPMs, removing some non-used modules and add the necessary code to get the RPMs so far