moved client and main entry point around