Commit b642730b authored by José Fonseca's avatar José Fonseca

Code reorganization: move files into their places.

This is in a separate commit to ensure renames are properly preserved.
parent 4593be34