Namespaces and buttons

Divided into namespaces and got Remove button working