Rearrange swing files into same groups as the models and controllers

There should be (virtually) no functionality changes for this pull request.