Requirements added. Cleaned up elements naming.
Merge branch 'requirements'