merged a few files for easier changes per npm/api moving forward