Added path, error handling, removed unnecessary files... overall a nice cleanup