CPP files adjusted for the rearranged bindings folder