Merged Password class and Salt class