Fix grunt building to support js packages conventions refactoring