Refactored package names and references in code. close #4

I have refactored the package names and any usage of the names in the code as discussed in #4.