made the structure standard
Merge pull request #1 from sepans/master

made the structure standard