Update composer for final namespace layout