reorganisation, added debian package stuff