Added classes for users and instruments. Changed some structure