Changed module naming to be more descriptive, added r.js task to grunt file