Updated folder s tructure

Because I am a retard, fixed folder layout.