Cleaned up structure and removed errors

[#77454982]