Convert subItems into part of items collection

Continued conversion to coffeescript
Clean up variable names, more methods

fixes #6
cleanup