Restructuring

Restructuring for easier viewing