Cleanup OCI layout

[jonesbusy]

Description

Cleanup OCI layout

Testing done

CI

Submitter checklist

• I have read and understood the CONTRIBUTING guide
• I have run mvn license:update-file-header, mvn spotless:apply, pre-commit run -a, mvn clean install before opening the PR

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.15%. Comparing base (66eee8a) to head (c36aff2).
Report is 2 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main     #199      +/-   ##
============================================
- Coverage     85.18%   85.15%   -0.04%     
- Complexity      378      385       +7     
============================================
  Files            30       30              
  Lines          1303     1307       +4     
  Branches        138      139       +1     
============================================
+ Hits           1110     1113       +3     
- Misses          128      129       +1     
  Partials         65       65              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.