Remove src from branch master
Fix issues