Reorganised and new editor setup script