Fixed include structure and created header to implement interface