Fix manage volumes function to only add tag to specified volume
Move files and cleanup a little
Move files and cleanup a little