Modified classes to fit the revised directory structure.