Deleted old folder and prepared for merge with master
Deleted old folder and prepared for merge with master