Revert "Basic elements in 4 classes"

This reverts commit ff4000e83645626ab520d6ba853e240d677a8d98.