Organized build.gradle and added OSGi manifest