Added calendar. Refactored asset organization and Ruby yeilds