Some restructuring for debian packaging