Merge tag '2.0.1' into develop

2.0.1
Redo the directory structure and add more functions
Merge branch 'release/2.1.0'