Changed encoding to UTF-8
Added Eclipse settings dir to ingore file
cleaned up some packages.
Moved out of main into test