minor: file reorg
Add success message to basic handler