changed directory structure and gruntfile accordingly