Cleaned up and added some modules for SVM testing.