Restructured the apk folder to be more clear.