Made package moar betterer.
Changed file name to avoid confusion.
Renamed files.
Renamed files.