Moved main files into their dirs fixed Nomonhan a bit