refactored package names
updated some files