working on users and restructure