got rid of customly added framework
Merge remote-tracking branch 'origin/master'
fixed folder structure