Changed file structure, added different icons to point data