HUGE change of layout > not tested yet though
tested & removed grunt
slight restructure