Renamed files and moved them into more intuitively-named folders.