New features organization. Working in the issue #1
New features organization. Working in the issues #1 and #2.