Moved actions to other bundle as TODO metioned
This is bad impl, so it has to go