Refactor: Corrected File Structure