Refactor init/buffers files