Make sure files go into the right package