Fixed dependency loop, simplied path configuration