Moved modules, updated Password object