Re organised homeworks