Update structure of directories; progress developing demo