Move files with tests to reflect the code

Change-Id: I7949457fb1ad056dc3db09b43ecf73bc8a61d5a8
Merge "Move files with tests to reflect the code"