Reorganize files
Merge pull request #63 from guillermooo/reorg

Reorganize files