add jade structure
fix merge commits