Fixed Password storing and classes refactoring