MCDemo - Refactor Code Structure