Fixing some issues with folders being treated as sub-modules