Cleanup project, split it into Demo and Data Gather. Minor memory fix