build source files

 - fix builder for Core and More

Use delegation?