Organize files to follow default directory layout