More moving. Finally fixed the packaging. Also fixed all but one (stupid) dependency. :)