Revert "Rename Shape to Shape.java"

This reverts commit f0f832c9cc1ec616d4c984522767b90a451c6de0.
Revert "Revert "Rename Shape to Shape.java""

This reverts commit ac67839cfa632d953cc88a01d2830c7ec4d2d324.