Move packages
Fix regression where it wouldn't start. Where? Good question...