Directory restructure and changes grunt tasks for tthe same