Package structure changes and code cleanup...