package renamed and cleanup
misc fixes