File restructure and cleanup
Merge branch 'master' of https://github.com/vaibhavparnalia/Xamarin