Moved to our own package dir
Reverted BufferedInputStream as it needs.