structure
fixed paths
Merge pull request #4 from esrgc/reorder

Reorder