Re-struture some files/folders