Major cleanup, changed all to cpp/h files for better portability
Created new diagrams