Moved files...

...to respect the new configuration