Apply Architecture of Master Branch to Demo