Element class renaming ans restructuring