Revert "Revert "Added "empty" folders for classes.""

This reverts commit ccca4a971ccbaa2c0d8aa0425d4820d76abd5eae.
Revert "Revert "Revert "Added "empty" folders for classes."""

This reverts commit 15209b22f8ca63eb4f09a4c1720f49f1521c887c.
Revert "Revert "Revert "Revert "Added "empty" folders for classes.""""

This reverts commit f650dff6cbf4377fb23233fa02d58213cc9fcb3a.