Merge pull request #13 from areteCocoa/master

Reorganization
Closes #11