much moar refactoring
Added config for proguard