Updated imports to use new directory structure and moved 1d argparse logic to utils
Moved 2d argparsers into utils and cleaned up run scripts in makefile