rename modules folder and fix some indendation