Dependency class folder and status improvement