Move more classes to more specific locations.

Moved .model classes to .base.
Deleted some unused classes.
Moved functional tests into a new .funcitonal package.
Followup to 1450250.

Change-Id: Ic087fe4a014d9179fab3dc6f833aaf73373f9452
92 files changed