Restructuring datastore and dataelements

This is my path forward.