Moving Main to main dir so that we can switch analyses by command line switch
part of moving this to the main dir...