changed user object
Restructured schema
Restructured schema more
Updated the database
Fixed and merged in db changes
Final adjust to fix all