Refactored Actions into Action Folder