Added Gradle and Fixed Packaging