Restructures modules in contrib & custom folders