Add 'modules' folder support