Fixes #97
Remove unused project
Fixes #98

Fixes issues & Code refactoring
Fixes #99
Fixes #100
Fixes #101
Fixes #103
Remove unused project
Fixes #107
Fixes #110
Fixes #109, #111
Fixes #121
Fixes #124
Fixes #112