Change up structure, add utf-8 encoding