echo-sd: Modulize