Move attributes to the correct file