Restructured files, migrate on Xamarin
update