move save to Storage
move save to Storage
remove unused constant
change builder parameteres for btree
refactor storage names
fix javadoc