file structure changes, modified sources and makefile accordingly
added add() function