Adding more uploads
Rearranging debian templates