Add logging.
Delete dead code.
Move layouts.
v1.0.0-b80