Updates to directory structure. Updated grunt file to support requires.