Restructure samples project to match default Android studio project