Fix: Add missing classes back into the git structure