Z-carriage

Optimize the file structure