I changed the layout to use that from https://github.com/angular/angular-seed which I'll take as the standard layout, and it also comes with testing and dependency management through the bower.json.  No code changes have been made.  I've copied my existing files into the new structure.  Next I will delete my originals.
Small clean up removing some aliases I had in there before.
Copied over any remaining files into new structure and deleted originals.