Change Code Structure