Lorenz class and some project reorganization