Refactored Content collection, updates tests, and jstar cli