Handlers refactor

Rename resource handlers
Add default handler
Add default handler test