Reorganize directories and files structures