Mayor update

Directory has changed, have been added new classes to continue
developing the interface.