Reorganizing package to match conventional structure, fixed some package.json values.
Macros are defined by acorn now.

Added missing semicolons, bumped version.