move things into same package