Restructured sources to fit better with the structure of the lecture slides