Merge pull request #476 from spothanis/reorg

[rfr] Reorganized volumes and volumeattach to move fixtures to subpackage