Moved action listeners into new classes