Moved stuff into test folder.  Some performance tests.