Rename and move to the right package