Move ConsoleBase into separate module