Thank you! Done!
Please review the code restructure.