Reorganize files, add geocaches to map