fixed warning
Just some eclipse project setting (src folder, etc)
moved resource for import to aded repo
added some null checks...
working on unit tests