Re-arranging file-structure