Restructor

Changing how to system files