Reorganized files
Refactored code

Added error handling
Version bump