Move the unit tests into the correct location. Kill off some unused libraries.