Moving files back to correct classes