Restructure the commons/android package