Moved everything to Atomic and create new fields

Moved everything to Atomic and create new fields