Change package names to be a bit more in-line with Flume conventions
(and to make more sense)