Impoved file structure for v3.0.0