Updates

Updated the separated version of the files so they are not required to
be used together.