Update and rename etc.cpp to src/etc.cpp