More concise Make output
Reorganization