Reorganization + updates final version