Clean up imports
Add account manager and salting passwords