Add library files and movie_json cleanup