Moved buffer module into io module