Ignored .idea directory and refactored some package references
Ignored .idea directory and refactored some package references
Merge pull request #5 from jtolla/reorganization

Reorganization