Moved file structure around.