Fix require bug introduced with folder structure change