Added a bit more structure to make the compilation easier.
More structure