Include 'circuits' to directory path to make it uniform with node_modules import

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -256,10 +256,10 @@ export class CircomPluginClient extends PluginClient {
               const version = splitInclude[1].match(/v[0-9]+.[0-9]+.[0-9]+/g)
 
               if (version && version[0]) {
-                path = `https://raw.githubusercontent.com/iden3/circomlib/${version[0]}/circuits/${splitInclude.slice(2).join('/')}`
+                path = `https://raw.githubusercontent.com/iden3/circomlib/${version[0]}/${splitInclude.slice(2).join('/')}`
                 dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
               } else {
-                path = `https://raw.githubusercontent.com/iden3/circomlib/master/circuits/${splitInclude.slice(1).join('/')}`
+                path = `https://raw.githubusercontent.com/iden3/circomlib/master/${splitInclude.slice(1).join('/')}`
                 dependencyContent = await this.call('contentImport', 'resolveAndSave', path, null)
               }
             } else {
@@ -335,9 +335,9 @@ export class CircomPluginClient extends PluginClient {
           const version = splitInclude[1].match(/v[0-9]+.[0-9]+.[0-9]+/g)
 
           if (version && version[0]) {
-            path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/${version[0]}/circuits/${splitInclude.slice(2).join('/')}`
+            path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/${version[0]}/${splitInclude.slice(2).join('/')}`
           } else {
-            path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/master/circuits/${splitInclude.slice(1).join('/')}`
+            path = `/.deps/https/raw.githubusercontent.com/iden3/circomlib/master/${splitInclude.slice(1).join('/')}`
           }
           // @ts-ignore
           const exists = await this.call('fileManager', 'exists', path)

libs/remix-ws-templates/src/templates/hashchecker/circuits/calculate_hash.circom

@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
 
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
 
 template CalculateHash() {
     signal input value1;

libs/remix-ws-templates/src/templates/rln/circuits/rln.circom

@@ -1,7 +1,7 @@
 pragma circom 2.1.0;
 
 include "./utils.circom";
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
 
 template RLN(DEPTH, LIMIT_BIT_SIZE) {
     // Private signals

libs/remix-ws-templates/src/templates/rln/circuits/utils.circom

@@ -1,9 +1,9 @@
 pragma circom 2.1.0;
 
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
-include "circomlib/mux1.circom";
+include "circomlib/circuits/mux1.circom";
-include "circomlib/bitify.circom";
+include "circomlib/circuits/bitify.circom";
-include "circomlib/comparators.circom";
+include "circomlib/circuits/comparators.circom";
 
 template MerkleTreeInclusionProof(DEPTH) {
     signal input leaf;

libs/remix-ws-templates/src/templates/rln/circuits/withdraw.circom

@@ -1,6 +1,6 @@
 pragma circom 2.1.0;
 
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
 
 template Withdraw() {
     signal input identitySecret;

libs/remix-ws-templates/src/templates/semaphore/circuits/semaphore.circom

@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
 
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
 include "./tree.circom";
 
 template CalculateSecret() {

libs/remix-ws-templates/src/templates/semaphore/circuits/tree.circom

@@ -1,7 +1,7 @@
 pragma circom 2.0.0;
 
-include "circomlib/poseidon.circom";
+include "circomlib/circuits/poseidon.circom";
-include "circomlib/mux1.circom";
+include "circomlib/circuits/mux1.circom";
 
 template MerkleTreeInclusionProof(nLevels) {
     signal input leaf;