refactoring more. added files/packages.