CleanupReorg
Cleanup buildoutput
assembly
some ACs, refacoring impl