Move main() back to main.cpp