Made package names and files a little more generic