As per the previous commit these files were no longer being imported, which is now fixed by moving them into separate subfolders.