Add support for dpkg and reorg a bit