Reorganisation for grunt integration
Reorganisation for grunt integration