Removed heavy dependencies
Rearranged and added volume manager
New rearrangement