General cleanup

Cleaned up a bit in the file locations and changed the filename to
version 0.5.