Refactored to better organize jelly files