Moved classes into seperate files
Refactored RJDBC inheritance