renamed a package and moved classes accordingly