Revert "Removing class files.[2]"

This reverts commit b0fc967d55a392dbbf340ad889b86ea28473e822.
File structure cleanup