bricks, utils and layouts copied
modified files that could cause merge conflicts
testclasses copied