Reorganized directories. Exercises 2.1-3