Reorganised boilerplate structure