Better organization
Release v3.0.2