Reorganization + added descriptions