More folder structure fixes.

Moved ACTIONS to it's own class file and currently reworking how this gets used.