Reorganizing modules folder.