Fix naming and other small details

- Fix Grunt taks
- Change naming
- Better folder organization