BAD-38: Restructured project shims
Merge pull request #1 from mattyb149/master

Restructured shim projects