removal of uneeded class to simplify code after directory restructure