New test ice and ocean model directories and some refactoring. Won't compile.