build refactor and demo links