Broke apart generic files into directories

* Added new package name for each directory.
* Update tests to match new package names.