More restructuring optimizing and what not

Looks like my Grunt tasks are properly set up now