Collector: Refactor package structure and polish code style (#49)

58 files changed