cleanup, add new cpp files