Organize Elements

Signed-off-by: joalmay <joalmay@gmail.com>