Simplify layout, add missing files