Moving to submodules. Easier for the user.