Fixed package definitions
Cleaned up circular.js