Added hpp security and includes
Fixed makefile for new classes