restructure directories, fix json serialization for kinesis