Re-organization of files and dirs