Safe move for logical organisation

Moved some files into subfolders sharing their name (within eclipse,
with references updated by eclipse this time) - remember that commits
can be reverted at any time.