Removed failing test.  Moved files to make folders cleaner.