Reorganised all maven modules so they now located appropriately based on what they do