Move some things around for better integration with outside apps