BAD-38: Restructured shims project in 4.4.x compatible branch