Moving some dependencies to exisiting EP6 modules