Modified FileNames and packageName for ease of integration
Minor Changes added all files