Added Callback Parsing

 - Moved code into multiple files.
 - Added some tests