Fixed gruntfile and moved files to lib