Restructure lib. add/remove functionality
Add initial tests