folder refactoring + grunt

Vladminir, 
I have create a "virtual" 2.4.3 version since you merge a PR since my fork. Not sure if my last commit should be taken. It is late and maybe my brain is asking for some rest :)