Fixed interpose directory structure
Removed unused variable
TEMP
TEMP, working on including missing code from functions directory
Renamed files
Close on the C -> C++ conversion