Fixed up jshint task and moved files around