BAD-38: Restructured project shims