Cleanup: Move receivable data types to separate file
Codechange: Move Data Handler functionality to separate class