Refactoring class names and bundling action request