Restructured action & action classes