Moved bricks and modules into views