Reorg code to support multiple demo projects