#65 Big changes in package structure
Merge pull request #118 from sialcasa/#65_refactoring_package_structure

#65 Big changes in package structure