Renamed packages following java convention & fixed eclipse import issues
Minor rename - to import into eclipse...go eclipse > import > choose src folder