WIP: Compile necessary files for Spa.

In progress, but shouldn't break anything. A few types have changed
location, but nothing in Client.