Changing package names to follow Java conventions