refactored packages
removed unused try/catch
added integration tests