Redo the directory structure and add more functions
Merge branch 'release/2.1.0'
Merge tag '2.1.0' into develop

Release: 2.1.0