Finished elements re-structuration. Closes #1