Refactored grunt and added icon subfolders

* Would like to move Genericons folder into icons (needs discussion)