Renamed 2 files and removed 3 files

Change-Id: Ic3eb8b8a2960299d37f71b4152a59195ea40468f
Reviewed-on: http://review.couchbase.org/32774
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>