Cleanup content architecture and add features info