Add Brick and Entity classes, update/simplify Makefile