Build Code partly reorganized, not yet finished