Moved stuff around to better fit Debian packaging.