[cleanning] function renamming
[added] new/water

[improved] group url by method
[added] tank & tag