Revert "Use hive-style partitioning and folder structure"

This reverts commit 589f5c4eee1668c63f56dbc8d0e9dade9bb81968.
Use service as partition key instead of portal

Avro entries already contain portal - you cannot have duplicate columns.