cleanup, new naming of paths & classes