Fixes to build setup after folder got moved