Try overrides
Re-organize
Re-organize directories - this makes overrides a piece of cake
No need to keep these
Only compile buttons - the rest needs to be synced with the recent helper changes