Reorganize

try this one
Merge pull request #1 from gabrielking9/patch-1

Reorganize