Further improvements to the structure, some foundation for resume