Fix pod spec, and move things around