Code Restructuring Complete!

It looks like everything is working 100% as well!