Project re-structure and also complete Grunt setup