reorganized source and updated gruntfile