Move out controls and make namespace for graph actions