main index and some reshuffling of files
big cleanup
sync test