Updated some imports according to new filenames and folders.