Organized imports
Updated lecture reference to lecture id