Move feeders to proper packages