improved organization, added jade support