refactor Action Class to new structure
refactor Action Class to new structure