updated file structure, removed demo