Re-organize files and fix pod spec pointing to old version.