Added some structure to the root