Reorganised stuff so it is easy to build.