Update builder and reveal
Remove old files
Remove another old file
Update function header
Cleanup test.cpp file