changed directory structure and added a class based value function