Move dependencies to sub modules