Naming conventions changed
structural changes
Added error handling module