Refactored and changed directory layout to match grunt file's injection reqs.