Fixed path errors due to code reorg