fixed stubfile locations after code reorg