Moved user class into class directory