package name change, remove class prefix, preparation for module division
create modules