Almost complete refactoring of Builder and Debian/Server for enabling Ubuntu/Server