Fixed buffer size error and restructured directory.