Fixing compiler warnings
Fixed naming so there is proper package name, removed compiler warnings
and unused library includes.