Implements new structure and adds disk information
Merge pull request #6 from beeman/master

Implements new structure and adds disk information