Removed elementals
Restructuring
ok