Improve directory organization; continue presentation work.