more work on gruntfile and file structure