Arrange folders
Merge pull request #3 from wiredearp/master

Arrange folders