Re-arragned the current files in their appropriate folders