Fix #1: Create Code Structure