Directory logic was remodeled. Test classes made for Branch and User.