Renamed claim.* to action.* for generality if any more action groups are added at a later date
Removed old files
Pointless typedef
Redundant preprocessor shortcut