refactor the starter kit for latest updates