new file organization and grunt watch (refs #2)