restructure for clean debian install