update architecture and use jade