Shuffling files around to more appropriate names/places.
Compiler error fixes.
Turn off trying to use adaptive solver until solver is refactored.