Small reorganizations and components page