[RPP] Placed modules into proper folders