Added folders for Android and Service code