Added source files
Renamed package and fixed logging problems