Refactoring Actions and Direction modules