Reallocation of files

Couple of files moved around into different packages to help
compartmentalize code better.