Updated to make compatible with a simple pull, so files don't have to be moved in order to be used right out of the box.