Collated globals into individual file. Clean up shell.cpp slightly