Reshaped directory tree to accomodate new Android Gradle structure