Rearrange modules so that they are easier to visualise

Top level directory was getting crowded, so switching to using maven submodules to make it easier to visualise