minor bugfixes, refactoring around FormatSniffer, rearranged packaging to more mvn-friendly