Reorganized fs of first batch of exercises