Major reorganisation of init.el