Fixing Proguard path.
Minor refactoring of build structure.