Added console, pypy and some reorg