clean up. Added Brick and app to own file.