Second draft of files moved into countly directory.
Now with batched delivery and persistence