Sepatate fivefold and Update build rule