Restoration of files lost when moving client-side files to client-code folder. Adjustments to how grunt deploys karma tests.