More homework, and restructured directory