Added user Schema and cleaned up other schemas