Removed py files from upstream, removed spaces from directory names