Restructed the files hierarchy.