Rearrange headers to have a cleaner outline of the project.