build fixed and split to multiple files